home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Turnbull China Bikeride
/
Turnbull China Bikeride - Disc 2.iso
/
BARNET
/
ARMULATOR
/
ARMUL-PA
/
armul-patch
Wrap
Text File
|
1997-07-28
|
22KB
|
677 lines
Only in armul-arc/: HardImage1
Only in armul-arc/: HardImage2
diff --unified --recursive armul-arc/Makefile armul-fixed/Makefile
--- armul-arc/Makefile Mon Jul 28 16:42:51 1997
+++ armul-fixed/Makefile Mon Jul 28 16:23:39 1997
@@ -30,7 +30,7 @@
# Everything else should be ok as it is.
-OBJS = armcopro.o armemu26.o armemu32.o arminit.o \
+OBJS = armcopro.o armemu26.o arminit.o \
armsupp.o main.o dagstandalone.o armos.o \
bag.o armrdi.o arch/DispKbd.o arch/i2c.o arch/archio.o \
arch/fdc1772.o arch/ControlPane.o arch/hdc63463.o arch/ReadConfig.o
@@ -98,8 +98,8 @@
armemu26.o: armemu.c armdefs.h armemu.h
$(CC) $(CFLAGS) -o armemu26.o -c armemu.c
-armemu32.o: armemu.c armdefs.h armemu.h
- $(CC) $(CFLAGS) -o armemu32.o -DMODE32 -c armemu.c
+#armemu32.o: armemu.c armdefs.h armemu.h
+# $(CC) $(CFLAGS) -o armemu32.o -DMODE32 -c armemu.c
arminit.o: arminit.c armdefs.h armemu.h
$(CC) $(CFLAGS) -c $*.c
Only in armul-arc/: Makefile.orig
Only in armul-arc/: ROM
Only in armul-arc/arch: ControlPane.o
Only in armul-arc/arch: DispKbd.o
Only in armul-arc/arch: ReadConfig.o
Only in armul-arc/arch: archio.o
Only in armul-arc/arch: armarc.o
Only in armul-arc/arch: fdc1772.o
Only in armul-arc/arch: hdc63463.o
Only in armul-arc/arch: i2c.o
diff --unified --recursive armul-arc/armcopro.c armul-fixed/armcopro.c
--- armul-arc/armcopro.c Mon Jul 28 16:42:51 1997
+++ armul-fixed/armcopro.c Mon Jul 28 16:22:21 1997
@@ -16,6 +16,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "armdefs.h"
+#include "armrdi.h"
extern unsigned ARMul_CoProInit(ARMul_State *state) ;
extern void ARMul_CoProExit(ARMul_State *state) ;
@@ -209,7 +210,7 @@
state->Exception++ ;
return(0) ;
}
-
+#if 0
static unsigned IntCDP(ARMul_State *state, unsigned type, ARMword instr)
{static unsigned long finish ;
ARMword howlong ;
@@ -251,7 +252,7 @@
}
return(ARMul_CANT) ;
}
-
+#endif
/***************************************************************************\
* Install co-processor instruction handlers in this routine *
\***************************************************************************/
Only in armul-arc/: armcopro.c.orig
Only in armul-arc/: armcopro.o
Only in armul-arc/: armdefs.h.orig
diff --unified --recursive armul-arc/armemu.c armul-fixed/armemu.c
--- armul-arc/armemu.c Mon Jul 28 16:42:51 1997
+++ armul-fixed/armemu.c Mon Jul 28 15:34:26 1997
@@ -19,6 +19,7 @@
(gilbertd@cs.man.ac.uk) */
#include "armdefs.h"
#include "armemu.h"
+#include "armsupp.h"
static ARMword GetDPRegRHS(ARMul_State *state, ARMword instr) ;
static ARMword GetDPSRegRHS(ARMul_State *state, ARMword instr) ;
@@ -1807,7 +1808,7 @@
#ifdef MODE32
state->Reg[14] = pc + 4 ; /* put PC into Link */
#else
- state->Reg[14] = pc + 4 | ECC | ER15INT | EMODE ; /* put PC into Link */
+ state->Reg[14] = (pc + 4) | ECC | ER15INT | EMODE ; /* put PC into Link */
#endif
state->Reg[15] = pc + 8 + POSBRANCH ;
FLUSHPIPE ;
Only in armul-arc/: armemu.c.orig
diff --unified --recursive armul-arc/armemu.h armul-fixed/armemu.h
--- armul-arc/armemu.h Mon Jul 28 16:42:51 1997
+++ armul-fixed/armemu.h Mon Jul 28 15:35:35 1997
@@ -139,7 +139,7 @@
ASSIGNV((state->Reg[15] & VBIT) != 0) ; \
} \
else { \
- state->Reg[15] = R15PC | (s) & (CCBITS | R15INTBITS | R15MODEBITS) ; \
+ state->Reg[15] = R15PC | ((s) & (CCBITS | R15INTBITS | R15MODEBITS)) ; \
ARMul_R15Altered(state) ; \
}
#define SETABORT(i,m) state->Cpsr = ECC | EINT | (i) | (m)
Only in armul-arc/: armemu.h.orig
Only in armul-arc/: armemu26.o
Only in armul-arc/: armemu32.o
diff --unified --recursive armul-arc/arminit.c armul-fixed/arminit.c
--- armul-arc/arminit.c Mon Jul 28 16:42:51 1997
+++ armul-fixed/arminit.c Mon Jul 28 16:27:48 1997
@@ -188,9 +188,11 @@
state->Emulate = RUN ;
while (state->Emulate != STOP) {
state->Emulate = RUN ;
+#if 0
if (state->prog32Sig && ARMul_MODE32BIT)
pc = ARMul_Emulate32(state) ;
else
+#endif
pc = ARMul_Emulate26(state) ;
}
return(pc) ;
@@ -206,9 +208,11 @@
{ARMword pc = 0 ;
state->Emulate = ONCE ;
+#if 0
if (state->prog32Sig && ARMul_MODE32BIT)
pc = ARMul_Emulate32(state) ;
else
+#endif
pc = ARMul_Emulate26(state) ;
return(pc) ;
@@ -250,7 +254,7 @@
SETABORT(IBIT,state->prog32Sig?UNDEF32MODE:SVC26MODE) ;
ARMul_CPSRAltered(state) ;
state->Reg[14] = temp - 4 ;
- fprintf(stderr,"DAG: In ARMul_Abort: Taking undefined instruction trap R[14] being set to: 0x%08x\n",
+ fprintf(stderr,"DAG: In ARMul_Abort: Taking undefined instruction trap R[14] being set to: 0x%08lu\n",
state->Reg[14]);
break ;
case ARMul_SWIV : /* Software Interrupt */
Only in armul-arc/: arminit.c.orig
Only in armul-fixed/: arminit.h
Only in armul-arc/: arminit.o
diff --unified --recursive armul-arc/armos.c armul-fixed/armos.c
--- armul-arc/armos.c Fri Dec 9 13:40:53 1994
+++ armul-fixed/armos.c Mon Jul 28 17:43:41 1997
@@ -25,6 +25,7 @@
#include <time.h>
#include <errno.h>
#include <string.h>
+#include <unistd.h>
#ifdef __STDC__
#define unlink(s) remove(s)
@@ -53,6 +54,8 @@
#include "armdefs.h"
#include "armos.h"
+#include "armrdi.h"
+#include "armsupp.h"
#ifndef NOOS
#ifndef VALIDATE
/* #ifndef ASIM */
@@ -103,6 +106,7 @@
#define FIXCRLF(t,c) c
#endif
+#if 0
static ARMword softvectorcode[] =
{ /* basic: swi tidyexception + event; mov pc, lr;
ldmia r11,{r11,pc}; swi generateexception + event
@@ -118,6 +122,7 @@
0xef000098, 0xe1a0e00f, 0xe89b8800, 0xef000088, /*Error*/
0xe1a0f00e /* default handler */
};
+#endif
/***************************************************************************\
* Time for the Operating System to initialise itself. *
@@ -178,7 +183,7 @@
ARMul_WriteWord(state,4,FPENEWVECT(ARMul_ReadWord(state,i-4))) ; /* install new vector */
ARMul_ConsolePrint (state, ", FPE") ;
-/* #endif /* ASIM */
+/* #endif ASIM */
#endif /* VALIDATE */
#endif /* NOOS */
Only in armul-arc/: armos.o
diff --unified --recursive armul-arc/armrdi.c armul-fixed/armrdi.c
--- armul-arc/armrdi.c Mon Jul 28 16:42:51 1997
+++ armul-fixed/armrdi.c Mon Jul 28 19:17:40 1997
@@ -20,6 +20,7 @@
#include "armdefs.h"
#include "armemu.h"
#include "armos.h"
+#include "arminit.h"
#include "dbg_cp.h"
#include "dbg_conf.h"
#include "dbg_rdi.h"
@@ -32,9 +33,11 @@
#define Watch_AnyRead (RDIWatch_ByteRead+RDIWatch_HalfRead+RDIWatch_WordRead)
#define Watch_AnyWrite (RDIWatch_ByteWrite+RDIWatch_HalfWrite+RDIWatch_WordWrite)
+#if 0
static unsigned FPRegsAddr ; /* last known address of FPE regs */
#define FPESTART 0x2000L
#define FPEEND 0x8000L
+#endif
#define IGNORE(d) (d = d)
#ifdef RDI_VERBOSE
@@ -95,10 +98,7 @@
void ARMul_ConsolePrint(ARMul_State *state, const char *format, ...)
{
va_list ap;
- int ch;
- char *str, buf[CONSOLE_PRINT_MAX_LEN];
- int i, j;
- ARMword junk;
+ char ch, *str, buf[CONSOLE_PRINT_MAX_LEN];
va_start(ap, format);
vsprintf(buf, format, ap);
@@ -177,11 +177,11 @@
};
static int RDI_open(unsigned type, const Dbg_ConfigBlock *config,
- const Dbg_HostosInterface *hostif,
- struct Dbg_MCState *dbg_state)
+ const Dbg_HostosInterface *hostif /*,
+ struct Dbg_MCState *dbg_state*/)
/* Initialise everything */
{int virgin = (state == NULL);
- IGNORE(dbg_state);
+/* IGNORE(dbg_state); */
#ifdef RDI_VERBOSE
if (rdi_log & 1) {
@@ -378,10 +378,8 @@
\***************************************************************************/
static int RDI_CPread(unsigned CPnum, unsigned long mask, ARMword buffer[])
-{ARMword fpregsaddr, word[4] ;
-
- unsigned r, w ;
- unsigned upto ;
+{
+ unsigned r, upto ;
if (CPnum != 1 && CPnum != 2) {
unsigned char const *rmap = state->CPRegWords[CPnum];
@@ -498,9 +496,9 @@
\***************************************************************************/
static int RDI_CPwrite(unsigned CPnum, unsigned long mask, ARMword const buffer[])
-{unsigned r ;
+{
+ unsigned r ;
unsigned upto ;
- ARMword fpregsaddr;
if (CPnum != 1 && CPnum != 2) {
unsigned char const *rmap = state->CPRegWords[CPnum];
@@ -524,7 +522,7 @@
#endif
for (upto = 0, r = 0; r < rmap[-1]; r++)
if (mask & (1L << r)) {
- (void)state->CPWrite[CPnum](state, r, &buffer[upto]);
+ (void)state->CPWrite[CPnum](state, r, buffer[upto]);
upto += rmap[r];
}
return RDIError_NoError;
Only in armul-arc/: armrdi.c.orig
Only in armul-fixed/: armrdi.h
Only in armul-arc/: armrdi.o
Only in armul-arc/: armsupp.c.orig
Only in armul-fixed/: armsupp.h
Only in armul-arc/: armsupp.o
Only in armul-arc/: armul-arc
diff --unified --recursive armul-arc/armvirt.c armul-fixed/armvirt.c
--- armul-arc/armvirt.c Fri Dec 9 14:50:41 1994
+++ armul-fixed/armvirt.c Mon Jul 28 15:40:14 1997
@@ -23,8 +23,9 @@
freed as they might be needed again. A single area of memory may be
defined to generate aborts. */
-#include "armopts.h"
+/* #include "armopts.h" */
#include "armdefs.h"
+#include "armrdi.h"
#ifdef VALIDATE /* for running the validate suite */
#define TUBE 48 * 1024 * 1024 /* write a char on the screen */
diff --unified --recursive armul-arc/bag.c armul-fixed/bag.c
--- armul-arc/bag.c Fri Dec 9 13:46:12 1994
+++ armul-fixed/bag.c Mon Jul 28 15:41:15 1997
@@ -24,6 +24,8 @@
/* is deleted. */
/********************************************************************/
+#include <stdlib.h>
+
#include "bag.h"
#define HASH_TABLE_SIZE 256
diff --unified --recursive armul-arc/bag.h armul-fixed/bag.h
--- armul-arc/bag.h Fri Dec 9 13:59:15 1994
+++ armul-fixed/bag.h Mon Jul 28 15:41:31 1997
@@ -28,7 +28,7 @@
typedef enum {
NO_ERROR,
DELETED_OLD_PAIR,
- NO_SUCH_PAIR,
+ NO_SUCH_PAIR
} Bag_error;
void BAG_putpair(long first, long second);
Only in armul-arc/: bag.o
diff --unified --recursive armul-arc/communicate.c armul-fixed/communicate.c
--- armul-arc/communicate.c Fri Dec 9 13:46:54 1994
+++ armul-fixed/communicate.c Mon Jul 28 15:46:41 1997
@@ -25,6 +25,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
+#include <unistd.h>
#include "armdefs.h"
@@ -79,7 +80,7 @@
this is probably preferable to locking up. */
return -1;
fprintf(stderr, "Waiting for connection from debugger...");
- debugsock = accept(sockethandle, &isa, &i);
+ debugsock = accept(sockethandle, (struct sockaddr *)&isa, &i);
if (debugsock < 0) { /* Now we are in serious trouble... */
perror("accept");
return -1;
@@ -129,7 +130,7 @@
fprintf(stderr, "Connection with debugger severed.\n");
return -1;
fprintf(stderr, "Waiting for connection from debugger...");
- debugsock = accept(sockethandle, &isa, &i);
+ debugsock = accept(sockethandle, (struct sockaddr *)&isa, &i);
if (debugsock < 0) { /* Now we are in serious trouble... */
perror("accept");
return -1;
@@ -176,19 +177,19 @@
MYwrite_char(sock, (i & 0xff000000) >> 24);
}
-void MYwrite_string(int sock, char *s) {
+void MYwrite_string(int sock, unsigned char *s) {
int i;
for (i = 0; MYwrite_char(sock, s[i]), s[i]; i++);
}
-int MYread_FPword(int sock, char *putinhere) {
+int MYread_FPword(int sock, unsigned char *putinhere) {
int i;
for (i = 0; i < 16; i++)
if (MYread_char(sock, &putinhere[i]) < 0) return -1;
return 0;
}
-void MYwrite_FPword(int sock, char *fromhere) {
+void MYwrite_FPword(int sock, unsigned char *fromhere) {
int i;
for (i = 0; i < 16; i++)
MYwrite_char(sock, fromhere[i]);
@@ -197,10 +198,10 @@
/* Takes n bytes from source and those n bytes */
/* down to dest */
int passon(int source, int dest, int n) {
- char *p;
+ unsigned char *p;
int i;
- p = (char *) malloc(n);
+ p = (unsigned char *) malloc(n);
if (!p) {
perror("Out of memory\n");
exit(1);
diff --unified --recursive armul-arc/communicate.h armul-fixed/communicate.h
--- armul-arc/communicate.h Fri Dec 9 13:59:55 1994
+++ armul-fixed/communicate.h Mon Jul 28 15:47:08 1997
@@ -19,9 +19,9 @@
void MYwrite_char(int sock, unsigned char c);
int MYread_word(int sock, ARMword *here);
void MYwrite_word(int sock, ARMword i);
-void MYwrite_string(int sock, char *s);
-int MYread_FPword(int sock, char *putinhere);
-void MYwrite_FPword(int sock, char *fromhere);
+void MYwrite_string(int sock, unsigned char *s);
+int MYread_FPword(int sock, unsigned char *putinhere);
+void MYwrite_FPword(int sock, unsigned char *fromhere);
int passon(int source, int dest, int n);
int wait_for_osreply(ARMword *reply); /* from kid.c */
diff --unified --recursive armul-arc/dagstandalone.c armul-fixed/dagstandalone.c
--- armul-arc/dagstandalone.c Sun Jul 27 14:28:36 1997
+++ armul-fixed/dagstandalone.c Mon Jul 28 17:41:57 1997
@@ -28,6 +28,7 @@
#endif
#include "armdefs.h"
+#include "bag.h"
#include "dbg_conf.h"
#include "dbg_hif.h"
#include "dbg_rdi.h"
@@ -49,8 +50,6 @@
/* RDI interface */
extern const struct RDIProcVec armul_rdi;
-static int MYrdp_level = 0;
-
static int rdi_state = 0;
/**************************************************************/
@@ -94,22 +93,18 @@
};
void dagstandalone() {
- char *p, *q;
- int i, j, k;
- unsigned char c, d, message;
- ARMword x, y, z;
+ int i;
struct sigaction action;
PointHandle point;
Dbg_ConfigBlock config;
Dbg_HostosInterface hostif;
- struct Dbg_MCState *MCState;
- char command_line[256];
+/* struct Dbg_MCState *MCState;*/
ARMword RegVals[]={0}; /* PC - reset*/
/* Setup a signal handler for SIGUSR1 */
action.sa_handler = dagstandalone_handlesignal;
- action.sa_mask = 0;
+ sigemptyset (&action.sa_mask);
action.sa_flags = 0;
sigaction(SIGUSR1, &action, (struct sigaction *) 0);
@@ -136,7 +131,7 @@
/* we have restarted, so kill off the existing run. */
/* armul_rdi.close(); */
}
- i = armul_rdi.open(0, &config, &hostif, MCState);
+ i = armul_rdi.open(0, &config, &hostif/*, MCState*/);
rdi_state = 1;
armul_rdi.CPUwrite(3 /* That should just about be svc 26 */,RDIReg_PC,
Only in armul-arc/: dagstandalone.o
diff --unified --recursive armul-arc/dbg_rdi.h armul-fixed/dbg_rdi.h
--- armul-arc/dbg_rdi.h Fri Dec 9 14:03:38 1994
+++ armul-fixed/dbg_rdi.h Mon Jul 28 17:41:26 1997
@@ -229,8 +229,8 @@
struct Dbg_HostosInterface;
struct Dbg_MCState;
typedef int rdi_open_proc(unsigned type, struct Dbg_ConfigBlock const *config,
- struct Dbg_HostosInterface const *i,
- struct Dbg_MCState *dbg_state);
+ struct Dbg_HostosInterface const *i/*,
+ struct Dbg_MCState *dbg_state*/);
typedef int rdi_close_proc(void);
typedef int rdi_read_proc(ARMword source, void *dest, unsigned *nbytes);
typedef int rdi_write_proc(const void *source, ARMword dest, unsigned *nbytes);
Only in armul-arc/: hexcmos
diff --unified --recursive armul-arc/kid.c armul-fixed/kid.c
--- armul-arc/kid.c Fri Dec 9 13:50:19 1994
+++ armul-fixed/kid.c Mon Jul 28 15:56:57 1997
@@ -24,6 +24,8 @@
#include <sys/types.h>
#include <signal.h>
+#include <unistd.h>
+#include <sys/time.h>
#include "armdefs.h"
#include "dbg_conf.h"
@@ -31,6 +33,7 @@
#include "dbg_rdi.h"
#include "gdbhost.h"
#include "communicate.h"
+#include "bag.h"
/* The pipes between the two processes */
extern int mumkid[2];
@@ -61,7 +64,7 @@
fprintf(stderr, "Terminate ARMulator excecution\n");
#endif
if (sig != SIGUSR1) {
- fprintf("Unsupported signal.\n");
+ fprintf(stderr, "Unsupported signal.\n");
return;
}
armul_rdi.info(RDISignal_Stop, (unsigned long *) 0, (unsigned long *) 0);
@@ -72,7 +75,7 @@
/* acts as an RDP to RDI interpreter on the front of the ARMulator. */
/********************************************************************/
void kid() {
- char *p, *q;
+ unsigned char *p, *q;
int i, j, k;
long outofthebag;
unsigned char c, d, message;
@@ -82,7 +85,7 @@
Dbg_ConfigBlock config;
Dbg_HostosInterface hostif;
struct Dbg_MCState *MCState;
- char command_line[256];
+ unsigned char command_line[256];
struct fd_set readfds;
/* Setup a signal handler for SIGUSR1 */
@@ -162,7 +165,7 @@
/* Read Memory Address */
MYread_word(mumkid[0], &x); /* address */
MYread_word(mumkid[0], &y); /* nbytes */
- p = (char *) malloc(y);
+ p = malloc(y);
i = armul_rdi.read(x, p, (unsigned *) &y);
MYwrite_char(kidmum[1], RDP_Return);
for (k = 0; k < y; k++)
@@ -177,7 +180,7 @@
/* Write Memory Address */
MYread_word(mumkid[0], &x); /* address */
MYread_word(mumkid[0], &y); /* nbytes */
- p = (char *) malloc(y);
+ p = malloc(y);
for (k = 0; k < y; k++)
MYread_char(mumkid[0], &p[k]);
i = armul_rdi.write(p, x, (unsigned *) &y);
@@ -192,7 +195,7 @@
/* Read CPU State */
MYread_char(mumkid[0], &c); /* mode */
MYread_word(mumkid[0], &x); /* mask */
- p = (char *) malloc(4 * RDINumCPURegs);
+ p = malloc(4 * RDINumCPURegs);
i = armul_rdi.CPUread(c, x, (ARMword *) p);
MYwrite_char(kidmum[1], RDP_Return);
for (k = 1, j = 0; k != 0x80000000; k *= 2)
@@ -207,7 +210,7 @@
MYread_char(mumkid[0], &c); /* mode */
MYread_word(mumkid[0], &x); /* mask */
- p = (char *) malloc(4 * RDINumCPURegs);
+ p = malloc(4 * RDINumCPURegs);
for (k = 1, j = 0; k != 0x80000000; k *= 2)
if (k & x) MYread_word(mumkid[0], &(((ARMword *) p)[j++]));
i = armul_rdi.CPUwrite(c, x, (ARMword *) p);
@@ -220,7 +223,7 @@
/* Read Co-Processor State */
MYread_char(mumkid[0], &c); /* CPnum */
MYread_word(mumkid[0], &x); /* mask */
- p = q = (char *) malloc(16 * RDINumCPRegs);
+ p = q = malloc(16 * RDINumCPRegs);
i = armul_rdi.CPread(c, x, (ARMword *) p);
MYwrite_char(kidmum[1], RDP_Return);
for (k = 1, j = 0; k != 0x80000000; k *= 2, j++)
@@ -243,7 +246,7 @@
/* Write Co-Processor State */
MYread_char(mumkid[0], &c); /* CPnum */
MYread_word(mumkid[0], &x); /* mask */
- p = q = (char *) malloc(16 * RDINumCPURegs);
+ p = q = malloc(16 * RDINumCPURegs);
for (k = 1, j = 0; k != 0x80000000; k *= 2, j++)
if (k & x) {
if ((c == 1 || c == 2) && k <= 128) {
@@ -387,7 +390,7 @@
break;
default:
- fprintf (stderr, "Unsupported info code %d\n", x);
+ fprintf (stderr, "Unsupported info code %lu\n", x);
break;
}
break;
@@ -401,7 +404,7 @@
/* Reset */
for (i = 0; i < 50; i++)
MYwrite_char(kidmum[1], RDP_Reset);
- p = (char *) malloc(MAXHOSTNAMELENGTH + 5 + 20);
+ p = malloc(MAXHOSTNAMELENGTH + 5 + 20);
sprintf(p, "Running on %s:%d\n", localhost, socketnumber);
MYwrite_string(kidmum[1], p);
free(p);
@@ -421,16 +424,11 @@
/* in 'putinr0' with the data if appropriate. */
int wait_for_osreply(ARMword *reply)
{
- char *p, *q;
- int i, j, k;
- unsigned char c, d, message;
- ARMword x, y, z;
+ unsigned char *p;
+ int i, k;
+ unsigned char c, message;
+ ARMword x, y;
struct sigaction action;
- PointHandle point;
- Dbg_ConfigBlock config;
- Dbg_HostosInterface hostif;
- struct Dbg_MCState *MCState;
- char command_line[256];
struct fd_set readfds;
#ifdef DEBUG
@@ -468,7 +466,7 @@
/* Read Memory Address */
MYread_word(mumkid[0], &x); /* address */
MYread_word(mumkid[0], &y); /* nbytes */
- p = (char *) malloc(y);
+ p = malloc(y);
i = armul_rdi.read(x, p, (unsigned *) &y);
MYwrite_char(kidmum[1], RDP_Return);
for (k = 0; k < y; k++)
@@ -483,7 +481,7 @@
/* Write Memory Address */
MYread_word(mumkid[0], &x); /* address */
MYread_word(mumkid[0], &y); /* nbytes */
- p = (char *) malloc(y);
+ p = malloc(y);
for (k = 0; k < y; k++)
MYread_char(mumkid[0], &p[k]);
i = armul_rdi.write(p, x, (unsigned *) &y);
@@ -497,7 +495,7 @@
case RDP_OSOpReply :
/* OS Operation Reply */
MYread_char(mumkid[0], &c);
- if (c == 1) MYread_char(mumkid[0], (char *) reply);
+ if (c == 1) MYread_char(mumkid[0], (unsigned char *) reply);
if (c == 2) MYread_word(mumkid[0], reply);
return c;
break;
diff --unified --recursive armul-arc/main.c armul-fixed/main.c
--- armul-arc/main.c Mon Jul 28 16:42:51 1997
+++ armul-fixed/main.c Mon Jul 28 16:29:57 1997
@@ -28,12 +28,7 @@
void dagstandalone(void);
int main(int argc, char *argv[]) {
- int i;
dagstandalone();
return 1;
}
-
-
-
-
Only in armul-arc/: main.c.orig
Only in armul-arc/: main.o
diff --unified --recursive armul-arc/parent.c armul-fixed/parent.c
--- armul-arc/parent.c Fri Dec 9 13:51:16 1994
+++ armul-fixed/parent.c Mon Jul 28 15:58:48 1997
@@ -24,6 +24,8 @@
#include <stdio.h>
#include <sys/types.h>
#include <signal.h>
+#include <unistd.h>
+#include <sys/time.h>
#include "armdefs.h"
#include "dbg_rdi.h"
@@ -415,7 +417,7 @@
break;
default:
- fprintf (stderr, "Unrecognized RDIInfo request %d\n",
+ fprintf (stderr, "Unrecognized RDIInfo request %lu\n",
messagetype);
goto panic_error;
}